bitkeeper revision 1.906 (40a5e91cnvIS_3gLwfnD2G3HV3odHA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sat, 15 May 2004 09:55:40 +0000 (09:55 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sat, 15 May 2004 09:55:40 +0000 (09:55 +0000)
commit5080a3f4b2b79dfba61e45ebbefc83531338e20e
treec041e3970d3180d897d08f3797305926f9ebd383
parent5a258f039214b3d6cc25477ba02a48ee3df14732
parent8a1284a0b37dc0b0522b80ac78f84047ab6278ae
bitkeeper revision 1.906 (40a5e91cnvIS_3gLwfnD2G3HV3odHA)

manual merge
xen/arch/i386/traps.c
xen/common/dom0_ops.c
xen/common/domain.c
xen/common/memory.c
xen/include/asm-i386/processor.h